Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Species Custom Sprites #856

Closed
wants to merge 16 commits into from
Closed

Species Custom Sprites #856

wants to merge 16 commits into from

Conversation

FoxxoTrystan
Copy link
Contributor

@FoxxoTrystan FoxxoTrystan commented Jan 9, 2024 •
edited
Loading

About the PR

Added a bunch of sprites for Vulpkanin, Lizard and felinds.

This PR also makes that tails/HeadTop does not peek out of hardsuits or some suits that has the tags.

Thanks for GentleButter and ghostprince for assisting with the sprites!

  • Lizard Helmets/Head/Hats
  • Vulpkanin Helmets/Head/Hats
  • Felinds Tail Cover
  • Lizard Tail Cover
  • Vulpkanin Tail Cover

Why / Balance

Lizard have helmets now! and fixes some for the vulps!

Also added more tags to hide species features on clothes.

Technical details

Sprite Hell.
Changed File regarding HiddenLayer Tag, added three new tags: "HidesSnout, HidesHeadTop, HidesTail"

NOTE: The "HidesTail" Tag is also visible on species comp for the reason that species comp with that tag will have their tail hidden.

Media

image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 FoxxoTrystan / GentleButter / GhostPrince

  • add: Lizard Custom Helmets!
  • fix: Fixes/Add Vulpkanin Custom Helmets, also hides HeadTop features on helmets.
  • add: Tail Cover for Vulpkanin, Lizard and Felinds!

@FoxxoTrystan FoxxoTrystan marked this pull request as draft January 9, 2024 15:05
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 9, 2024 •
edited
Loading

RSI Diff Bot; head commit 7fbe789 merging into 6c4e410
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi

State Old New Status
equipped-head-vulpkanin Modified
equipped-head-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi

State Old New Status
combat-equipped-HELMET-vulpkanin Modified
off-equipped-HELMET-vulpkanin Modified
on-equipped-HELMET-vulpkanin Modified
combat-equipped-HELMET-reptilian Added
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi

State Old New Status
off-equipped-HELMET-vulpkanin Modified
on-equipped-HELMET-vulpkanin Modified
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi

State Old New Status
off-equipped-HELMET-vulpkanin Modified
on-equipped-HELMET-vulpkanin Modified
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi

State Old New Status
equipped-HELMET-vulpkanin Modified
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Mask/gas.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/gasatmos.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/gascentcom.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/gasexplorer.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/gassecurity.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/gassyndicate.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/medical.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/medicalsecurity.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/muzzle.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/squadron.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/sterile.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Mask/swat.rsi

State Old New Status
equipped-MASK-reptilian Modified

Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi

State Old New Status
off-equipped-HELMET-vulpkanin Removed
on-equipped-HELMET-vulpkanin Removed

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
off-equipped-HELMET-vulpkanin Added
on-equipped-HELMET-reptilian Added
on-equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
off-equipped-HELMET-vulpkanin Added
on-equipped-HELMET-reptilian Added
on-equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
off-equipped-HELMET-vulpkanin Added
on-equipped-HELMET-reptilian Added
on-equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
off-equipped-HELMET-vulpkanin Added
on-equipped-HELMET-reptilian Added
on-equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
off-equipped-HELMET-vulpkanin Added
on-equipped-HELMET-reptilian Added
on-equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi

State Old New Status
equipped-head-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/basic.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi

State Old New Status
equipped-head-reptilian Added
equipped-head-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi

State Old New Status
equipped-HELMET-reptilian Added
equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/medical.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi

State Old New Status
equipped-HELMET-reptilian Added
equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi

State Old New Status
equipped-HELMET-reptilian Added
equipped-HELMET-vulpkanin Added

Resources/Textures/Clothing/Head/Hardsuits/rd.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/security.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi

State Old New Status
off-equipped-HELMET-reptilian Added
on-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Helmets/eva.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Helmets/eva_large.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi

State Old New Status
equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi

State Old New Status
equipped-HELMET-reptilian Added
up-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi

State Old New Status
equipped-HELMET-reptilian Added
up-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi

State Old New Status
equipped-HELMET-reptilian Added
up-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Head/Welding/welding.rsi

State Old New Status
equipped-HELMET-reptilian Added
up-equipped-HELMET-reptilian Added

Resources/Textures/Clothing/Mask/italian_moustache.rsi

State Old New Status
equipped-MASK-reptilian Added

Resources/Textures/Clothing/Mask/ninja.rsi

State Old New Status
equipped-MASK-reptilian Added

Resources/Textures/Clothing/Mask/plaguedoctormask.rsi

State Old New Status
equipped-MASK-reptilian Added

Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Bio/general.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Bio/security.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added
equipped-OUTERCLOTHING-reptilian Added
equipped-OUTERCLOTHING-vulpkanin Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi

State Old New Status
equipped-OUTERCLOTHING-felinds Added

Edit: diff updated after 7fbe789

@FoxxoTrystan FoxxoTrystan marked this pull request as ready for review January 10, 2024 14:35
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 10, 2024
@Cheackraze
Copy link
Member

The majority of these sprites were CC-BY-SA-3.0, which says you must indicate if the original was modified in anyway, in order to not misrepresent the original artists work or to imply the endorsement of the original author.

So in all those meta.json files, you should indicate that you 3 modified the designs. I admit I didn't review every single one yet, but if you come across any that have different licenses than CC BY SA 3.0, I can help navigate how best to list the licensing. On the bright side, you'll all get your names embedded into the artwork licensing for them all from the repo!

@FoxxoTrystan
Copy link
Contributor Author

FoxxoTrystan commented Jan 19, 2024 •
edited
Loading

The majority of these sprites were CC-BY-SA-3.0, which says you must indicate if the original was modified in anyway, in order to not misrepresent the original artists work or to imply the endorsement of the original author.

So in all those meta.json files, you should indicate that you 3 modified the designs. I admit I didn't review every single one yet, but if you come across any that have different licenses than CC BY SA 3.0, I can help navigate how best to list the licensing. On the bright side, you'll all get your names embedded into the artwork licensing for them all from the repo!

Id like assistance on how to correctly list it, as upstream merge and others issues may... conflict with it

Anywho il edit Meta files, tomorrow.

@Cheackraze
Copy link
Member

The majority of these sprites were CC-BY-SA-3.0, which says you must indicate if the original was modified in anyway, in order to not misrepresent the original artists work or to imply the endorsement of the original author.
So in all those meta.json files, you should indicate that you 3 modified the designs. I admit I didn't review every single one yet, but if you come across any that have different licenses than CC BY SA 3.0, I can help navigate how best to list the licensing. On the bright side, you'll all get your names embedded into the artwork licensing for them all from the repo!

Id like assistance on how to correctly list it, as upstream merge and others issues may... conflict with it

Anywho il edit Meta files, tomorrow.

That's fine, conflicts like this are inevitable but unlike code, are very simple to resolve by just amending all the additions. The more difficult part about sprite merge conflicts is when we have conflicting states. Anyways, do t worry about that too much for now.

@FoxxoTrystan
Copy link
Contributor Author

The majority of these sprites were CC-BY-SA-3.0, which says you must indicate if the original was modified in anyway, in order to not misrepresent the original artists work or to imply the endorsement of the original author.
So in all those meta.json files, you should indicate that you 3 modified the designs. I admit I didn't review every single one yet, but if you come across any that have different licenses than CC BY SA 3.0, I can help navigate how best to list the licensing. On the bright side, you'll all get your names embedded into the artwork licensing for them all from the repo!

Id like assistance on how to correctly list it, as upstream merge and others issues may... conflict with it
Anywho il edit Meta files, tomorrow.

That's fine, conflicts like this are inevitable but unlike code, are very simple to resolve by just amending all the additions. The more difficult part about sprite merge conflicts is when we have conflicting states. Anyways, do t worry about that too much for now.

and compleated.

@Cheackraze
Copy link
Member

RSI validation hit on one of your files. It's fairly strict on syntaxes, so make sure the license is stated exactly how it wants it, i.e., CC-BY-SA-4.0 with all the appropriate dashes and stuff

@FoxxoTrystan
Copy link
Contributor Author

RSI validation hit on one of your files. It's fairly strict on syntaxes, so make sure the license is stated exactly how it wants it, i.e., CC-BY-SA-4.0 with all the appropriate dashes and stuff

:[
Thats silly, anywho fixed!

@dvir001
Copy link
Contributor

dvir001 commented Jan 24, 2024

Can you convert the HidesSnout and HidesHeadTop tags to comps?
I fear we will have a mess the moment a new tag is added on upstream.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Feb 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@FoxxoTrystan
Copy link
Contributor Author

FoxxoTrystan commented Feb 8, 2024 •
edited
Loading

The hell is that Linter upstream hell?

Upstream lizard helmets

I fixed merge conflicts with it but linter seem unhappy with things not related to my PR.
Unless my PR got fucked.

Reverting and il carefully pick the changes instead of pressing "update from upstream"

@FoxxoTrystan
Revert "Upstream merge"
b5c977e 
This reverts commit 7fbe789, reversing
changes made to 24a7b72.
@github-actions github-actions bot added Docs Improvements or additions to documentation Map-Shuttle Map - Shuttle Map-POI Map - POI Map-Bluespace Map - Bluespace Event Map-Admin Map - For admin use Map-Dungeon Map - Dungeon UI FTL Map-Outpost Map - Outpost Merge Conflict This PR has conflicts that prevent merging and removed Sprites YML labels Feb 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Feb 9, 2024
@FoxxoTrystan
Revert "upstream test"
3a01168 
This reverts commit 78f0592, reversing
changes made to b5c977e.
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Feb 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 9, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Cheackraze
Copy link
Member

could you include a fix for attribution on a few? we are missing "vulpkanin version taken from Paradise station at ParadiseSS13/Paradise@f0fa4e1 edited by Floofers" proper crediting on a few of the vulp helm sprites:

frontier-station-14/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json

Line 18 in f1d8141

"name": "equipped-MASK-vulpkanin",

frontier-station-14/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json

Line 18 in f1d8141

"name": "equipped-MASK-vulpkanin",

frontier-station-14/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json

Line 30 in f1d8141

"name": "equipped-MASK-vulpkanin",

frontier-station-14/Resources/Textures/Clothing/Mask/mime.rsi/meta.json

Line 18 in f1d8141

"name": "equipped-MASK-vulpkanin",

@Cheackraze
Copy link
Member

and I'll help fix this branch tonight or tomorrow

@dvir001
Copy link
Contributor

dvir001 commented Feb 11, 2024 •
edited
Loading

and I'll help fix this branch tonight or tomorrow

Please convert the HidesSnout and HidesHeadTop tags to comps so we wont have a tag nightmare later
You can see I done it for the race files in a way the code scan for them so we removed tags.

@FoxxoTrystan FoxxoTrystan marked this pull request as draft February 13, 2024 23:35
@FoxxoTrystan
Copy link
Contributor Author

PR moved to Draft until i can fix the fucky fucky.

@GreaseMonk
Copy link
Contributor

Any plans to update this ? ❤️

@dvir001
Copy link
Contributor

dvir001 commented Mar 13, 2024 •
edited
Loading

Any plans to update this ? ❤️

If this PR can use comps and avoid tags X_X
You will notice I did I fixed the annoying part for the species by adding the scan to the c# so it wont need new tags on species but all cloth going to have major tags issues unless were using comps

@FoxxoTrystan
Copy link
Contributor Author

Any plans to update this ? ❤️

I planned indeed to update this when i have access to my PC with the test server.
AND PLEASE LET ME USSSE TAAAAGS! A

@dvir001
Copy link
Contributor

dvir001 commented Apr 8, 2024

Im temp closing this since its seems to be a bit broken at the moment after merge.
Also, if anything changes with upstream tags making them less problematic with parenting the use of tags won't be an issue anymore.

@dvir001 dvir001 closed this Apr 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvir001 dvir001 Awaiting requested review from dvir001

@Cheackraze Cheackraze Awaiting requested review from Cheackraze

Assignees
No one assigned
Labels
C# Docs Improvements or additions to documentation FTL Map-Admin Map - For admin use Map-Bluespace Map - Bluespace Event Map-Dungeon Map - Dungeon Map-Outpost Map - Outpost Map-POI Map - POI Map-Shuttle Map - Shuttle Merge Conflict This PR has conflicts that prevent merging Status: Needs Review This PR is awaiting reviews UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@FoxxoTrystan @Cheackraze @dvir001 @GreaseMonk